Merge from trunk
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 1 Feb 2011 17:09:25 +0000 (12:09 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 1 Feb 2011 17:09:25 +0000 (12:09 -0500)
commit3d09c28b4e6f94ab90affe1192e3c4030b94f24b
tree5c0f1c720bb2116cb00f79242f8fd061e8db4e0d
parent4beb85f02977fc8e198f171a61406ae9a7032625
parent165b0276f09bc343e407b3accf5e48a0b04a2415
Merge from trunk
33 files changed:
doc/lispref/elisp.texi
doc/lispref/functions.texi
doc/lispref/objects.texi
doc/lispref/vol1.texi
doc/lispref/vol2.texi
lisp/ChangeLog.trunk
lisp/Makefile.in
lisp/emacs-lisp/byte-opt.el
lisp/emacs-lisp/bytecomp.el
lisp/emacs-lisp/disass.el
lisp/emacs-lisp/edebug.el
lisp/emacs-lisp/lisp-mode.el
lisp/help-fns.el
lisp/ielm.el
lisp/ldefs-boot.el
lisp/simple.el
lisp/subr.el
src/ChangeLog.trunk
src/alloc.c
src/buffer.c
src/bytecode.c
src/callint.c
src/data.c
src/doc.c
src/eval.c
src/fns.c
src/globals.h
src/image.c
src/keyboard.c
src/lisp.h
src/lread.c
src/minibuf.c
src/print.c